Merge with xenppc-unstable-merge.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 13 Apr 2007 10:14:26 +0000 (11:14 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 13 Apr 2007 10:14:26 +0000 (11:14 +0100)

Trivial merge